From 1e511a0c52c471ba93b3f89d82c7dda76999c5b1 Mon Sep 17 00:00:00 2001
From: "kaf24@firebug.cl.cam.ac.uk" <kaf24@firebug.cl.cam.ac.uk>
Date: Tue, 22 Mar 2005 09:03:36 +0000
Subject: [PATCH] bitkeeper revision 1.1236.1.106
 (423fdf68Jj2B3iL1Ab8caOSNgsAs-w)

Cross-architecture build fixes.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
---
 xen/drivers/char/console.c | 1 +
 xen/drivers/pci/quirks.c   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index a69b5d19d8..8813609df3 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -20,6 +20,7 @@
 #include <asm/uaccess.h>
 #include <asm/mm.h>
 #include <asm/debugger.h>
+#include <asm/io.h>
 
 /* opt_console: comma-separated list of console outputs. */
 static char opt_console[30] = OPT_CONSOLE_STR;
diff --git a/xen/drivers/pci/quirks.c b/xen/drivers/pci/quirks.c
index 71c0bb428d..25de96ba44 100644
--- a/xen/drivers/pci/quirks.c
+++ b/xen/drivers/pci/quirks.c
@@ -18,7 +18,6 @@
 #include <xen/pci.h>
 #include <xen/init.h>
 #include <xen/delay.h>
-#include <asm/io_apic.h>
 
 #undef DEBUG
 
@@ -333,6 +332,8 @@ static void __init quirk_vt82c686_acpi(struct pci_dev *dev)
 
 #ifdef CONFIG_X86_IO_APIC 
 
+#include <asm/io_apic.h>
+
 /*
  * VIA 686A/B: If an IO-APIC is active, we need to route all on-chip
  * devices to the external APIC.
-- 
2.30.2